dbusServices: Always import dbus errors

This makes sure custom errors are registered correctly, even when
the service doesn't do anything other than passing them on.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3159>

diff --git a/js/dbusServices/dbusService.js b/js/dbusServices/dbusService.js
index ab7af9291bc3fb7f8a8149b6058752570edb834d..941deaf294920682df4397b07c49fa30e4db34b7 100644 (file)
--- a/js/dbusServices/dbusService.js
+++ b/js/dbusServices/dbusService.js
@@ -3,6 +3,8 @@ import GLib from 'gi://GLib';
 
 import {programArgs} from 'system';
 
+import './misc/dbusErrors.js';
+
 const Signals = imports.signals;
 
 const IDLE_SHUTDOWN_TIME = 2; // s

diff --git a/js/dbusServices/org.gnome.ScreenSaver.src.gresource.xml b/js/dbusServices/org.gnome.ScreenSaver.src.gresource.xml
index d77f72a6895e4b37d1e857f883548436c356f779..b0179238dc0fc26fe638edafd323de7a01545755 100644 (file)
--- a/js/dbusServices/org.gnome.ScreenSaver.src.gresource.xml
+++ b/js/dbusServices/org.gnome.ScreenSaver.src.gresource.xml
@@ -6,6 +6,7 @@
     <file>dbusService.js</file>
 
     <file>misc/config.js</file>
+    <file>misc/dbusErrors.js</file>
     <file>misc/dbusUtils.js</file>
   </gresource>
 </gresources>

diff --git a/js/dbusServices/org.gnome.Shell.Extensions.src.gresource.xml b/js/dbusServices/org.gnome.Shell.Extensions.src.gresource.xml
index 5db7b115f6cf752d323c1fc3642324b6e636cdc0..a233986a856885eef769a344c860c5c1f8f359bb 100644 (file)
--- a/js/dbusServices/org.gnome.Shell.Extensions.src.gresource.xml
+++ b/js/dbusServices/org.gnome.Shell.Extensions.src.gresource.xml
@@ -12,6 +12,7 @@
     <file>misc/config.js</file>
     <file>misc/errorUtils.js</file>
     <file>misc/extensionUtils.js</file>
+    <file>misc/dbusErrors.js</file>
     <file>misc/dbusUtils.js</file>
     <file>misc/params.js</file>
   </gresource>

diff --git a/js/dbusServices/org.gnome.Shell.Notifications.src.gresource.xml b/js/dbusServices/org.gnome.Shell.Notifications.src.gresource.xml
index 4e039ba69bd3ebd1192182dd3ad0ea9a16fb50b9..e3e3b402356dcadaa732d5911df3c57d961f07c5 100644 (file)
--- a/js/dbusServices/org.gnome.Shell.Notifications.src.gresource.xml
+++ b/js/dbusServices/org.gnome.Shell.Notifications.src.gresource.xml
@@ -6,6 +6,7 @@
     <file>dbusService.js</file>
 
     <file>misc/config.js</file>
+    <file>misc/dbusErrors.js</file>
     <file>misc/dbusUtils.js</file>
   </gresource>
 </gresources>

diff --git a/js/dbusServices/org.gnome.Shell.Screencast.src.gresource.xml b/js/dbusServices/org.gnome.Shell.Screencast.src.gresource.xml
index a247050e3af185089a3bb90a017db06ec2e9591a..d07a3ec7f8e1d7fa2cdfe9b7c1582245dad26995 100644 (file)
--- a/js/dbusServices/org.gnome.Shell.Screencast.src.gresource.xml
+++ b/js/dbusServices/org.gnome.Shell.Screencast.src.gresource.xml
@@ -7,6 +7,7 @@
 
     <file>misc/config.js</file>
     <file>misc/dbusUtils.js</file>
+    <file>misc/dbusErrors.js</file>
     <file>misc/signals.js</file>
     <file>misc/signalTracker.js</file>
   </gresource>